Merge branch 'debian/experimental' into debian/master

diff --cc debian/changelog
index cc0a01b87ee71a3fd2b7e1f238baed4d6bdc674e,1dc317a3482cfdb988be889d4d326ae5b9be423f..c4955434af9420efcfc67e80a4ccd571dec13cdf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,15 +1,23 @@@
+ ostree (2018.5+42+gecdebeb2-1) UNRELEASED; urgency=medium
+ 
+   * Switch to experimental branch
+   * New upstream git snapshot with support for peer-to-peer software
+     collections, required by Flatpak's peer-to-peer app sharing feature
+     - d/copyright: Update
+     - d/libostree-1-1.symbols: Update
+     - Build-depend on Avahi libraries
+   * d/rules: Explicitly enable various desired libraries
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 08 Jun 2018 09:10:21 +0100
+ 
 +ostree (2018.5-2) unstable; urgency=medium
 +
 +  * d/tests/gnome-desktop-testing: Skip libostree/test-concurrency.py.test
 +    during autopkgtest. It does not appear to be completely reliable.
 +    (See #901170)
 +
 + -- Simon McVittie <smcv@debian.org>  Sun, 10 Jun 2018 13:57:19 +0100
 +
  ostree (2018.5-1) unstable; urgency=medium
  
    * New upstream release